Merge from emacs-24; up to r108163
authorChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:36:02 +0000 (08:36 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:36:02 +0000 (08:36 +0800)

Trivial merge